From: Ville Syrjälä Date: Wed, 9 Oct 2013 14:24:57 +0000 (+0300) Subject: drm/i915: Populate primary_disabled in intel_modeset_readout_hw_state() X-Git-Tag: archive/raspbian/4.9.13-1+rpi1~10^2~7226^2~90^2~205 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=e5b611fd4493d09eb5164f5244ac0a5325346895;p=linux-4.9.git drm/i915: Populate primary_disabled in intel_modeset_readout_hw_state() Make sure our primary_disabled matches our expectations after driver init. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=70270 Tested-by: Paulo Zanoni Signed-off-by: Ville Syrjälä Tested-by: shui yangwei Reviewed-by: Jani Nikula Signed-off-by: Daniel Vetter --- diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index f5126b81b435..b54a4cf899f9 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -10706,6 +10706,7 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev) &crtc->config); crtc->base.enabled = crtc->active; + crtc->primary_disabled = !crtc->active; DRM_DEBUG_KMS("[CRTC:%d] hw state readout: %s\n", crtc->base.base.id,